-
Notifications
You must be signed in to change notification settings - Fork 6.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[libmad] Fix libmad header for non-x86 MSVC targets #8959
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
janisozaur
force-pushed
the
libmad-arm64
branch
from
November 11, 2019 22:43
1b2cd74
to
48e8866
Compare
The differences between --- mad.h 2019-11-11 23:42:12.918310412 +0100
+++ msvc++/mad.h 2004-01-23 10:36:03.000000000 +0100
@@ -33,7 +33,7 @@
# define SIZEOF_LONG_LONG 8
-/* Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp */
+/* Id: version.h,v 1.24 2003/05/27 22:40:37 rob Exp */
# ifndef LIBMAD_VERSION_H
# define LIBMAD_VERSION_H
@@ -51,7 +51,7 @@
MAD_VERSION_STRING(MAD_VERSION_PATCH) \
MAD_VERSION_EXTRA
-# define MAD_PUBLISHYEAR "2000-2004"
+# define MAD_PUBLISHYEAR "2000-2003"
# define MAD_AUTHOR "Underbit Technologies, Inc."
# define MAD_EMAIL "info@underbit.com"
@@ -62,7 +62,7 @@
# endif
-/* Id: fixed.h,v 1.38 2004/02/17 02:02:03 rob Exp */
+/* Id: fixed.h,v 1.36 2003/05/28 04:36:00 rob Exp */
# ifndef LIBMAD_FIXED_H
# define LIBMAD_FIXED_H
@@ -253,22 +253,7 @@
: "cc"); \
__result; \
})
-# elif defined(OPT_INTEL)
-/*
- * Alternate Intel scaling that may or may not perform better.
- */
-# define mad_f_scale64(hi, lo) \
- ({ mad_fixed_t __result; \
- asm ("shrl %3,%1\n\t" \
- "shll %4,%2\n\t" \
- "orl %2,%1" \
- : "=rm" (__result) \
- : "0" (lo), "r" (hi), \
- "I" (MAD_F_SCALEBITS), "I" (32 - MAD_F_SCALEBITS) \
- : "cc"); \
- __result; \
- })
-# else
+# else
# define mad_f_scale64(hi, lo) \
({ mad_fixed_t __result; \
asm ("shrdl %3,%2,%1" \
@@ -543,7 +528,7 @@
# endif
-/* Id: bit.h,v 1.12 2004/01/23 09:41:32 rob Exp */
+/* Id: bit.h,v 1.11 2003/05/27 22:40:36 rob Exp */
# ifndef LIBMAD_BIT_H
# define LIBMAD_BIT_H
@@ -572,7 +557,7 @@
# endif
-/* Id: timer.h,v 1.16 2004/01/23 09:41:33 rob Exp */
+/* Id: timer.h,v 1.15 2003/05/27 22:40:37 rob Exp */
# ifndef LIBMAD_TIMER_H
# define LIBMAD_TIMER_H
@@ -654,7 +639,7 @@
# endif
-/* Id: stream.h,v 1.20 2004/02/05 09:02:39 rob Exp */
+/* Id: stream.h,v 1.18 2003/05/27 22:40:37 rob Exp */
# ifndef LIBMAD_STREAM_H
# define LIBMAD_STREAM_H
@@ -680,7 +665,6 @@
MAD_ERROR_BADCRC = 0x0201, /* CRC check failed */
MAD_ERROR_BADBITALLOC = 0x0211, /* forbidden bit allocation value */
MAD_ERROR_BADSCALEFACTOR = 0x0221, /* bad scalefactor index */
- MAD_ERROR_BADMODE = 0x0222, /* bad bitrate/mode combination */
MAD_ERROR_BADFRAMELEN = 0x0231, /* bad frame length */
MAD_ERROR_BADBIGVALUES = 0x0232, /* bad big_values count */
MAD_ERROR_BADBLOCKTYPE = 0x0233, /* reserved block_type */
@@ -743,7 +727,7 @@
# endif
-/* Id: frame.h,v 1.20 2004/01/23 09:41:32 rob Exp */
+/* Id: frame.h,v 1.19 2003/05/27 22:40:36 rob Exp */
# ifndef LIBMAD_FRAME_H
# define LIBMAD_FRAME_H
@@ -840,7 +824,7 @@
# endif
-/* Id: synth.h,v 1.15 2004/01/23 09:41:33 rob Exp */
+/* Id: synth.h,v 1.14 2003/05/27 22:40:37 rob Exp */
# ifndef LIBMAD_SYNTH_H
# define LIBMAD_SYNTH_H
@@ -889,7 +873,7 @@
# endif
-/* Id: decoder.h,v 1.17 2004/01/23 09:41:32 rob Exp */
+/* Id: decoder.h,v 1.16 2003/05/27 22:40:36 rob Exp */
# ifndef LIBMAD_DECODER_H
# define LIBMAD_DECODER_H |
The CI reports errors such as:
which is quite bogus and doesn't seem related to this PR. |
Yes, see #8949. |
/azp run |
cbezault
approved these changes
Nov 19, 2019
JackBoosY
approved these changes
Nov 19, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.